bitkeeper revision 1.1159.1.523 (41d54b30O4rbtOVTyJB2Od7jzSW30g)

manual merge

diff --cc .rootkeys
index 11bdd2c1ad520f6492e7118fae2995f2b0f0224f,89187e42af6e1e245b925f53e3f5f7218938fcac..dfedd8bf52c9796e54b0623e3da21e665821f289
--- 1/.rootkeys
--- 2/.rootkeys
+++ b/.rootkeys
@@@ -145,8 -145,8 +145,9 @@@
  40f56238bnvciAuyzAiMkdzGErYt1A linux-2.6.10-xen-sparse/arch/xen/i386/kernel/head.S
  40f58a0d31M2EkuPbG94ns_nOi0PVA linux-2.6.10-xen-sparse/arch/xen/i386/kernel/i386_ksyms.c
  40faa751_zbZlAmLyQgCXdYekVFdWA linux-2.6.10-xen-sparse/arch/xen/i386/kernel/ioport.c
 +41d00d82zN8IfLBRxc7G_i7lbwT3cQ linux-2.6.10-xen-sparse/arch/xen/i386/kernel/irq.c
  40f56238ue3YRsK52HG7iccNzP1AwQ linux-2.6.10-xen-sparse/arch/xen/i386/kernel/ldt.c
+ 41d54a76YMCA67S8J-TBT3J62Wx6yA linux-2.6.10-xen-sparse/arch/xen/i386/kernel/microcode.c
  4107adf1cNtsuOxOB4T6paAoY2R2PA linux-2.6.10-xen-sparse/arch/xen/i386/kernel/pci-dma.c
  40f56238a8iOVDEoostsbun_sy2i4g linux-2.6.10-xen-sparse/arch/xen/i386/kernel/process.c
  40f56238YQIJoYG2ehDGEcdTgLmGbg linux-2.6.10-xen-sparse/arch/xen/i386/kernel/setup.c

diff --cc linux-2.6.10-xen-sparse/arch/xen/configs/xen0_defconfig
Simple merge

diff --cc linux-2.6.10-xen-sparse/arch/xen/i386/Kconfig
Simple merge

diff --cc linux-2.6.10-xen-sparse/arch/xen/i386/kernel/Makefile
index e1bf116e4a49c98768d929026f0f4d8921b4fcc7,c304fbb0cd850eff697be77ca848ab1731dfdbcc..b8af41d65cae8c2944e5fc0f4f6cb3078a656613
--- 1/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/Makefile
--- 2/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/Makefile
+++ b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/Makefile
@@@ -25,13 -25,12 +25,13 @@@ c-obj-$(CONFIG_ACPI_BOOT)  += acpi
  c-obj-$(CONFIG_MCA)           += mca.o
  c-obj-$(CONFIG_X86_MSR)               += msr.o
  c-obj-$(CONFIG_X86_CPUID)     += cpuid.o
- c-obj-$(CONFIG_MICROCODE)     += microcode.o
+ obj-$(CONFIG_MICROCODE)               += microcode.o
  c-obj-$(CONFIG_APM)           += apm.o
 -c-obj-$(CONFIG_X86_SMP)               += smp.o smpboot.o
 -c-obj-$(CONFIG_X86_TRAMPOLINE)        += trampoline.o
 +obj-$(CONFIG_X86_SMP)         += smp.o smpboot.o
 +#obj-$(CONFIG_X86_TRAMPOLINE) += trampoline.o
  c-obj-$(CONFIG_X86_MPPARSE)   += mpparse.o
 -c-obj-$(CONFIG_X86_LOCAL_APIC)        += apic.o nmi.o
 +#obj-$(CONFIG_X86_LOCAL_APIC) += apic.o
 +c-obj-$(CONFIG_X86_LOCAL_APIC)        += nmi.o
  c-obj-$(CONFIG_X86_IO_APIC)   += io_apic.o
  c-obj-$(CONFIG_X86_NUMAQ)     += numaq.o
  c-obj-$(CONFIG_X86_SUMMIT_NUMA)       += summit.o

diff --cc xen/arch/x86/dom0_ops.c
Simple merge

diff --cc xen/include/asm-x86/processor.h
index d7bd5ec4e45b573a517a9e1996be021dc7029a69,55deb004a9769eb151b74c21eee6679f55f2025e..bed1464bac8eedd2dfe2287ba60364aa1fe1e11c
--- 1/xen/include/asm-x86/processor.h
--- 2/xen/include/asm-x86/processor.h
+++ b/xen/include/asm-x86/processor.h
@@@ -554,19 -530,19 +554,19 @@@ long set_gdt(struct exec_domain *d
               unsigned long *frames, 
               unsigned int entries);
  
 -long set_debugreg(struct domain *p, int reg, unsigned long value);
 +long set_debugreg(struct exec_domain *p, int reg, unsigned long value);
  
  struct microcode_header {
-         unsigned int hdrver;
-         unsigned int rev;
-         unsigned int date;
-         unsigned int sig;
-         unsigned int cksum;
-         unsigned int ldrver;
-         unsigned int pf;
-         unsigned int datasize;
-         unsigned int totalsize;
-         unsigned int reserved[3];
+     unsigned int hdrver;
+     unsigned int rev;
+     unsigned int date;
+     unsigned int sig;
+     unsigned int cksum;
+     unsigned int ldrver;
+     unsigned int pf;
+     unsigned int datasize;
+     unsigned int totalsize;
+     unsigned int reserved[3];
  };
  
  struct microcode {

diff --cc xen/include/public/dom0_ops.h
Simple merge